Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚠️ update deps to use k8s 1.22 #2340

Conversation

camilamacedo86
Copy link
Member

@camilamacedo86 camilamacedo86 commented Sep 17, 2021

Description
For Golang/v3 only:

  • Update deps to use k8s 1.22
  • Update controller-tools to 0.7.0
  • Update sigs.k8s.io/controller-runtime to 0.10.0
  • Update ENV TEST to 1.22

To ensure backwards compatibility:

  • If the flags crd-version or webhook-version be informed with v1beta1 the makefile and go.mod are updated, and the user informed
  • Marke as deprecate the flags crd-version or webhook-version since we probably will remove it in future versions.

Notes

  • Note that the projects scaffold with v1beta1 has been tested via e2e here.
  • We will need ignore APIDiff / Verify API differences (pull_request) in this case

Closes: #2339

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 17, 2021
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 17, 2021
@camilamacedo86 camilamacedo86 changed the title ⚠️ upgrading controller-runtime from 0.9.2 to 0.10.0 WIP: ⚠️ upgrading controller-runtime from 0.9.2 to 0.10.0 Sep 17, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 17, 2021
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 19, 2021
@camilamacedo86 camilamacedo86 changed the title WIP: ⚠️ upgrading controller-runtime from 0.9.2 to 0.10.0 ✨ update deps to use k8s 1.22 Sep 19, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 19, 2021
@camilamacedo86 camilamacedo86 changed the title ✨ update deps to use k8s 1.22 WIP ✨ update deps to use k8s 1.22 Sep 19, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 19, 2021
@camilamacedo86 camilamacedo86 force-pushed the update-controller-runtime branch 4 times, most recently from 349edb5 to 8d56b6f Compare September 19, 2021 18:16
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 19, 2021
@camilamacedo86 camilamacedo86 force-pushed the update-controller-runtime branch 6 times, most recently from 017e13c to a8d3be0 Compare September 20, 2021 13:03
@camilamacedo86
Copy link
Member Author

/test pull-kubebuilder-e2e-k8s-1-16-15

@camilamacedo86 camilamacedo86 force-pushed the update-controller-runtime branch 2 times, most recently from 70b163d to bc93841 Compare September 20, 2021 17:43
@camilamacedo86 camilamacedo86 changed the title WIP ✨ update deps to use k8s 1.22 ✨ update deps to use k8s 1.22 Sep 20, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Sep 20, 2021
@camilamacedo86 camilamacedo86 force-pushed the update-controller-runtime branch 2 times, most recently from 13e7d5f to 6766994 Compare September 20, 2021 22:26
@camilamacedo86 camilamacedo86 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 20, 2021
Description
Update deps to use k8s 1.22
Update controller-tools to 0.7.0
Update sigs.k8s.io/controller-runtime to 0.10.0
Update ENV TEST to 1.22
@camilamacedo86 camilamacedo86 changed the title ✨ update deps to use k8s 1.22 ⚠️ update deps to use k8s 1.22 Sep 20, 2021
// todo: it should be removed for go/v4
// nolint:lll,gosec
if p.resource.API.CRDVersion == "v1beta1" {
if err := applyScaffoldCustomizationsForVbeta1(); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would we still be supporting this in go/v3 ? Since we are scaffolding the project with k8s 1.22, should we be removing support for v1beta1 APIs completely ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To ensure backwards compatibility:

  • If the flags crd-version or webhook-version be informed with v1beta1 the makefile and go.mod are updated, and the user informed
  • Marke as deprecates the flags crd-version or webhook-version since we probably will remove it in future versions.

We cannot remove the option for go/v3. That would be a breaking change and we will allow to do that only when we create go/v4.

sigs.k8s.io/controller-tools v0.6.0 // for `kubebuilder alpha config-gen`
golang.org/x/tools v0.1.5
k8s.io/apimachinery v0.22.2 // for `kubebuilder alpha config-gen`
sigs.k8s.io/controller-runtime v0.10.0
Copy link
Member

@varshaprasad96 varshaprasad96 Sep 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker at all, but since the PR is still open we could do 0.10.1 of controller-runtime too as it has k8s bumped to 1.22.2

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. I think we can -)

Copy link
Member

@varshaprasad96 varshaprasad96 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 27, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, varshaprasad96

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@camilamacedo86
Copy link
Member Author

I will need to force this PR because of the APIDiff / Verify API differences (pull_request)

@camilamacedo86 camilamacedo86 merged commit ecce96f into kubernetes-sigs:master Oct 1, 2021
@camilamacedo86 camilamacedo86 deleted the update-controller-runtime branch October 1, 2021 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants